Skip to content

Conversation

@MarcaDian
Copy link

Synchronize changes with ReVanced/revanced-patches#6029

BenjaminHalko and others added 30 commits May 20, 2025 14:00
These never did anything and were removed from the figma a while ago.
@brosssh brosssh changed the title fix(Compose): Adjust ReVanced icons fix: Adjust ReVanced icons Sep 28, 2025
@MarcaDian
Copy link
Author

Also fix #1124
This is how it looks now

Copy link
Member

@validcube validcube left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🥞💄 Approved, see files section above for preview.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to use the logo with the border for rounded icons?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently, the logo with the frame has a rounded V and is different from the logo without the frame.

We need to come to a consensus on which logo to use, I asked this question before (ReVanced/revanced-patches#6007 (comment) and ReVanced/revanced-patches#6007 (comment)), but there was no answer, so I used the latest modified logo with "sharp" edges

Copy link
Contributor

@LisoUseInAIKyrios LisoUseInAIKyrios Oct 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The conversation here about rounded icons is lagged and was resolved in the patches PR.

For which logo to use? (Sharp inner V, or rounded inner V)? It should be whatever is in the branding guidelines repo.

It's odd that Manager has been using a slightly different (and slightly wrong?) logo this whole time.

@validcube
Copy link
Member

Hello!

Please rebase your change on top of the latest compose-dev tree (hopefully this should be your last rebase!)

Also, I forgot about this but don't you need to specify android:roundIcon in manifest as shown here?

https://developer.android.com/develop/ui/views/launch/icon_design_adaptive#:~:text=Adaptive%20Icons%20.-,Add%20your%20adaptive%20icon%20to%20your%20app,-Adaptive%20icons%2C%20just

Thanks!

@LisoUseInAIKyrios
Copy link
Contributor

Also, I forgot about this but don't you need to specify android:roundIcon in manifest as shown here?

The old round and square non adaptive icon can still be used for pre Android 8.0 devices, or for third party launchers that have forced off adaptive icons.

It's an unusual edge case, but it's possible they could still be used.

I think Google suggested ignoring updating the old icons to reduce work load for rare use cases, but they didn't say to remove the usage of them.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to rebase again.

Lots of random and unrelated commits are here.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't do a rebase, please tell me how to do it correctly.

Copy link
Contributor

@LisoUseInAIKyrios LisoUseInAIKyrios Oct 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If using command line:

  1. add upstream remote (if you haven't already): git remote add upstream https://github.com/ReVanced/revanced-manager.git

  2. Fetch upstream: git fetch upstream

  3. Rebase onto upstream: git rebase upstream/compose-dev

  4. Force push your branch to GitHub.

Or can do all this inside Intellij or Android Studio using menu commands.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or if all that fails, basically delete the branches and start over with a new branch.

Delete this branch, delete your compose-dev branch, checkout compose-dev again, make a new branch from compose-dev, apply icon changes, commit & push.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the merge from remote before rebasing is what got this into a mixed up state.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't needed. Just checkout the new compose branch and cherry pick your pr commits on top then push

# Conflicts:
#	.github/workflows/release.yml
#	api/build.gradle.kts
#	app/.releaserc
#	app/build.gradle.kts
#	app/src/main/res/drawable/ic_launcher_round.png
#	app/src/main/res/mipmap-hdpi/ic_launcher.png
#	app/src/main/res/mipmap-mdpi/ic_launcher.png
#	app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	docs/2_3_managing_patches.md
#	gradle.properties
#	gradle/libs.versions.toml
#	package-lock.json
#	package.json
@MarcaDian MarcaDian closed this Oct 1, 2025
@MarcaDian MarcaDian deleted the fix-icons-compose branch October 1, 2025 22:32
@MarcaDian
Copy link
Author

Moved to #2762

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.